Revert 6ebfa6f..c24fbb2

This rolls back to commit 6ebfa6fce896621313d1398cbe38e5658bd93bcb.