Revert f4d4ea6..4fb47e5

This rolls back to commit f4d4ea6fb5b2930fa7483a45eec19b88276354f0.