Revert a842587..b9da1f2

This rolls back to commit a8425878df446daf1890f7a76d4e28a5fdf15323.