Revert 0690bb7..feb8f3a

This rolls back to commit 0690bb7cb9064154c109ae7d2b5e79e75e1dec20.