Revert f460e97..38df9e3

This rolls back to commit f460e97860b57c95d31a3502cc53f3e6f3fedcf5.