Revert 276564b..19bb80e

This rolls back to commit 276564bab47bc7192529449a1365fd702763c81b.