Revert 2f206ce..2c691aa

This rolls back to commit 2f206cec0f7895400a192f53e8b16bf929a98537.