am f510f6c5: reset to 049af32 with history

* commit 'f510f6c5138358ebeafe63c47417648d31c51d7a':