Revert 6a9f84e..bf5121d

This rolls back to commit 6a9f84e481dbac6f2c221abdabe47a7de161fca3.