Revert 59efdf2..f0caadb

This rolls back to commit 59efdf237978b8505d5182eb9e1d2ea4c3240bc9.