Revert 0365b6b..ec784d6

This rolls back to commit 0365b6b5d9db01759500bc62d7e66ae5305fc1a8.
index